Replaced DX11 HLSL shading language with the more accurate SM_5_0 #2078
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
num3ric
commented
Oct 10, 2024
| @@ -265,7 +265,7 @@ const char * GpuLanguageToString(GpuLanguage language) | |||
| case GPU_LANGUAGE_GLSL_4_0: return "glsl_4.0"; | |||
| case GPU_LANGUAGE_GLSL_ES_1_0: return "glsl_es_1.0"; | |||
| case GPU_LANGUAGE_GLSL_ES_3_0: return "glsl_es_3.0"; | |||
| case GPU_LANGUAGE_HLSL_DX11: return "hlsl_dx11"; | |||
| case GPU_LANGUAGE_HLSL_SM_5_0: return "hlsl_sm_5.0"; | |||
There was a problem hiding this comment.
Don't remember... so let me know if any precautions are needed here as this change would cause cache id invalidation.
…del 5.0 (SM_5_0). Signed-off-by: Eric Renaud-Houde <[email protected]>
remia
reviewed
Oct 16, 2024
| GPU_LANGUAGE_MSL_2_0, ///< Metal Shading Language | ||
|
|
||
| // Deprecated enum(s) | ||
| GPU_LANGUAGE_HLSL_DX11 = GPU_LANGUAGE_HLSL_SM_5_0 |
There was a problem hiding this comment.
Don't remember exactly but didn't you mention the use of OCIO_DEPRECATED macro? Would it work here? Looking at the attribute [[depracated]] I think it should but not sure about the other fallback methods.
There was a problem hiding this comment.
Removed my previous comment about this because I thought it might be needlessly disruptive.
If we did want it however, it would require modifications to the macro for MSVC: the fix for __cplusplus in Aras P's other PR, and the deletion of __declspec(deprecated(msg)) which doesn't work with enums.
doug-walker
approved these changes
Oct 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://learn.microsoft.com/en-us/windows/win32/direct3dhlsl/overviews-direct3d-11-hlsl